Add an explicit_type TLV syntax for avoiding certain cases of type inference #3301
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3301 +/- ##
==========================================
+ Coverage 89.67% 89.72% +0.04%
==========================================
Files 126 126
Lines 103165 103747 +582
Branches 103165 103747 +582
==========================================
+ Hits 92510 93083 +573
- Misses 7935 7949 +14
+ Partials 2720 2715 -5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
TheBlueMatt
reviewed
Sep 6, 2024
dunxen
force-pushed
the
2024-9-fixnevertypefallback
branch
from
0778913 to
0d7b30d
Compare
|
I haven't looked for other cases where we can use this syntax to force the type, but if mentioned I can update them in this PR too. |
dunxen
changed the title
option_unit TLV type to fix dependency on fallback of`! -> () 
dunxen
force-pushed
the
2024-9-fixnevertypefallback
branch
from
0d7b30d to
a640926
Compare
|
Edited: Forgot to remove some things. Updated. git diff-tree -U1 0d7b30d 37e73cadiff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index 3837e3f1..8ebbac10 100644
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -287,3 +287,3 @@ macro_rules! _check_decoded_tlv_order {
($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, (required, explicit_type: $fieldty: ty)) => {{
- // no-op
+ _check_decoded_tlv_order!($last_seen_type, $typ, $type, $field, required);
}};
@@ -344,3 +344,3 @@ macro_rules! _check_missing_tlv {
($last_seen_type: expr, $type: expr, $field: ident, (required, explicit_type: $fieldty: ty)) => {{
- // no-op
+ _check_missing_tlv!($last_seen_type, $type, $field, required);
}};
@@ -387,6 +387,6 @@ macro_rules! _decode_tlv {
($outer_reader: expr, $reader: expr, $field: ident, (option, explicit_type: $fieldty: ty)) => {{
- $field = Some($crate::util::ser::Readable::read(&mut $reader)?);
+ let field: $fieldty = _decode_tlv!($outer_reader, $reader, $field, option); $field = Some(field);
}};
($outer_reader: expr, $reader: expr, $field: ident, (required, explicit_type: $fieldty: ty)) => {{
- $field = Some($crate::util::ser::Readable::read(&mut $reader)?);
+ let field: $fieldty = _decode_tlv!($outer_reader, $reader, $field, required); $field = field;
}}; |
dunxen
force-pushed
the
2024-9-fixnevertypefallback
branch
from
a640926 to
37e73ca
Compare
TheBlueMatt
reviewed
Sep 23, 2024
dunxen
force-pushed
the
2024-9-fixnevertypefallback
branch
3 times, most recently
from
c314602 to
100c99a
Compare
TheBlueMatt
reviewed
Oct 1, 2024
…inference This new syntax is used to fix "dependency on fallback of ! -> ()". This avoids cases where code compiles with a fallback of the never type leading to the unit type. The behaviour in Rust edition 2024 would make this a compile error. See: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/builtin/static.DEPENDENCY_ON_UNIT_NEVER_TYPE_FALLBACK.html#
dunxen
force-pushed
the
2024-9-fixnevertypefallback
branch
from
100c99a to
c0d84e8
Compare
TheBlueMatt
approved these changes
Oct 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.